Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Jul 2010 22:53:26 +0000 (22:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Jul 2010 22:53:26 +0000 (22:53 +0000)
commit2303d3e897b99799281cadc9f185131fd2555c49
tree4fbeb56a9a8d7ec1e2b99a34f6aaa8251e6f6538
parent82bdfcd6ee50b78a15339080f2fa460e044b72d4
parenta11964b8e08baee9fc536a82c3517651fd93b84a
Merge from mainline.